* Removes all base resources that exist also in telephony so
that there is not overlap.
* Overlays are coming in the next CL (the build doesn't break
even with overlays missing overlays.)

Bug: 149401237
Test: TeleServiceTests
Change-Id: I6b389f4f155c9d5a6f23a7ca3ff47db0e5a93208

Merge "Move the initialization of Call/SMS/MMS content observers out of the DataManager constructor"

Change-Id: Idfc4b99208b07e8a556a9350065de63ac06ac194

Change-Id: Iadd3ec32e21e0c6bcf716be854121a5125532b2f

[automerger skipped] Merge "RELAND: NetworkRequest: Embed requestor uid & packageName" am: 3819be42 -s ours am: f66d933b am: 45f6580b

Change-Id: I499c41c4a635ed521094d45e817859298e6ee2c7

[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: d8225828 -s ours am: 0c18826c -s ours
am skip reason: subject contains skip directive

Change-Id: I6389a0fa23cbeab2d2005f5546ba31bcff559415

[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: c01e98b6 -s ours am: ec079d39 -s ours
am skip reason: subject contains skip directive

Change-Id: I1bad62a475cfd38db7e7f5e75dc6c5addd2b9425

[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: c013d7c1 -s ours am: cccea53c -s ours
am skip reason: subject contains skip directive

Change-Id: I6272e6c0b6f3a586c07b926b0481f31d38816dc7

[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 8078d2f4 -s ours am: 9f548207 -s ours
am skip reason: subject contains skip directive

Change-Id: Ide6db8e306cd896276f3c7c475458ca8a27f3775

Merge "[vts-core] add vts_defaultPermissions_validate_test to vts-core" am: 65be777f am: 551116b9 am: 12239b0a

Change-Id: I2e43d9f7e7b8c2947dbdc8a1b3e6c29584a25b6e

[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 8fb59c3a -s ours am: 59664bda -s ours
am skip reason: subject contains skip directive

Change-Id: I851935e1218c6611cf0b421304bdc6513d369cfe

[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: d517cdb2 -s ours am: 5686e715 -s ours
am skip reason: subject contains skip directive

Change-Id: I269314dae2993ed056c90a05911576289024f06f

[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 5f8b3507 -s ours am: 757cc019 -s ours
am skip reason: subject contains skip directive

Change-Id: I220875cc5110f6fdf47320cfb78fdc50967173e1

Merge "Merge "Ensure adb key store is instantiated before revoking grants" into qt-qpr1-dev am: b6f974b2" into qt-qpr1-dev-plus-aosp am: 7f74ca73

Change-Id: I6faf74abbb08c0b86a2d976fdcf4250808e20243

Merge "Update counters for session encryption to start at 1." am: ae97b320 am: 61856cc9 am: d4a71792

Change-Id: I54af1835b167f1ed980b510e3acb11f26e39a5da

Merge "Remove hidden shared account methods from AccountManager.java" into qt-qpr1-dev am: eab74f8e am: 4976a532

Change-Id: I752977c5e3e661cfa55699f3bb2242b783223602

[automerger skipped] Merge "Implement Ikev2VpnRunner" am: b5bb5d4b am: ac609b99 am: 65e8d4e8 -s ours
am skip reason: skipped by user benedictwong

Change-Id: Ie1f6f8dbd10161342a7f14935def73820a68b057

Added a render service in ExtServices to connect to the renderer in
androidx.autofill for inline suggestion slices.

Cleaned up old UI rendering code that lived in system_server.

Bug: 146453086
Test: atest ExtServicesUnitTests
Change-Id: I25a7ea438afe524683671c850625ae80dacccfaa

This change is to speed up the system boot time. The people service
start time will be reduced from ~1.5 ms to ~0.5 ms.

Bug: 149245782
Test: Manual run with System.nanoTime() logged
Change-Id: I9114b3c9e3637b2498618220665cd98df1d1f994

Bug:149479986
Change-Id: Id8c6f083d5d25b4db8cc4d7809b6681a6b234547
Test: m framework

Sound trigger calls into audio policy manager (APM) for the sake of
allocating and releasing audio sessions.
APM calls into sound trigger for the sake of notifying it of
external capture session start/end.

Both calls are essentially synchronous, i.e. required for the
completion of the operations that trigger them.
Since both services use coarse locks to protect their state, if both
those calls happen concurrently, a deadlock would result.

The fix is to invoke
AudioPolicyManager::{acquire/release}SoundTriggerSession()
outside of the critical section of SoundTriggerModule.

Bug: 148691451
Change-Id: I157367b9e43963e37344958e1647e9f6c29d5e6e

* changes:
  SettingsLib: Rename requirePMF to requirePmf
  Wifi: Rename requirePMF to requirePmf

* changes:
  Controls UI - Theme + color alignment
  Controls UI - Support thumbnail template