NetworkTypeController set OVERRIDE_NETWORK_TYPE_NR_ADVANCED when
device connect NR and frequency is mmWave.

Bug: 179443240
Bug: 179453836
Test: atest frameworks/opt/telephony/src/java/com/android/internal/telephony/NetworkTypeController.java
Change-Id: I242e8499a1bb31dcb5a3f0fbae2f8423c8c8f8a0
Merged-In: I242e8499a1bb31dcb5a3f0fbae2f8423c8c8f8a0

ApiLint tries to only lint "new" APIs, i.e. those introduced since the
last frozen API. Using android-non-updatable's last frozen txt does not
work well for this, as it is incomplete API surface on its own, so
metalava cannot see all APIs that were present in the previous API
(such as methods inherited from ART), and so makes the wrong decisions
for which APIs are new.

Bug: 171506470
Test: m checkapi
Change-Id: I00d25f2ae0ba8f0ee6fa8564d86642efd74e0d44
Merged-In: I00d25f2ae0ba8f0ee6fa8564d86642efd74e0d44
(cherry picked from commit 4f90aa51)

Instead of throwing exceptions, return the default null/empty/void
behavior.

Test: atest TelephonyManagerTest
Fix: 175881713
Change-Id: Ia15c8183212bc67e74b45fc119b5ef9d4c295c94
Merged-In: Ia15c8183212bc67e74b45fc119b5ef9d4c295c94

Higher priority goes first in mPrioritySortedApnContexts, so change
default priority to be higher than enterprise.

Test: atest DcTrackerTest
Bug: 183738520
Change-Id: Ib2f9594933d00307276f4538714a5354d36baf09
Merged-In: Ib2f9594933d00307276f4538714a5354d36baf09

NoOp instead of return ISE when the device is not CDMA capable.

Test: atest TelephonyManagerTest
Fix: 175665470
Change-Id: I36d69f4bf337ef9c102327bfe87752c56847af87
Merged-In: I36d69f4bf337ef9c102327bfe87752c56847af87

Merge "Add KEY_CARRIER_SUPPORTS_CALLER_ID_VERTICAL_SERVICE_CODES_BOOL for treating *67 and *82 as a temporary mode CLIR when dialing E911"

dist_group replaces owner and the default is going to change, set it
to the current default "android" for frameworks/base java_sdk_libraries.

Bug: 186723288
Test: m checkbuild
Change-Id: I1526853951bcffbe5c5aec6fbc6ba8e0dbea95ad
Merged-In: I1526853951bcffbe5c5aec6fbc6ba8e0dbea95ad

Add KEY_CARRIER_SUPPORTS_CALLER_ID_VERTICAL_SERVICE_CODES_BOOL for treating *67 and *82 as a temporary mode CLIR when dialing E911

Test: atest
Bug: 182126268
Change-Id: Iab56a59d7cb17e3e8131304fbc906e101bb87b42
Merged-In: Iab56a59d7cb17e3e8131304fbc906e101bb87b42
(cherry picked from commit d4dd13c2)

FileCleanupReceiver was not unregister when switch NotificationHistory

Testing Steps:

1. Settings -> Apps and notifications -> Notifications -> Notification history
2. Repeat switch 1000 times and system crash.

Change-Id: I40493fe7726883a449e54888247c5bffcc1554e3

HTML ol element is used to declare an ordered list, not a list item.

Change-Id: I1fac2f236ce40effb54fdead01c99729d4ef15b4

1. Use final for Binder.clearCallingIdentity() to protect not being overwritten.
2. Protect it in the finally block of the try statement to avoid missing restore the CallingIdentity as exception.

Bug: 189819183
Test: Manual test
Change-Id: I2dd4cfc1aacecb0b77fa4c82b48b24b284271779
Merged-In: I2dd4cfc1aacecb0b77fa4c82b48b24b284271779

Some devices may not have certain partitions available and the
OverlayConfigTests use hardcoded paths to test OverlayConfig
functionality. This change ensures that the temporary directory
created to test OverlayConfig has all of the partitions defined in
PackagePartitions#SYSTEM_PARTITIONS within it.

Bug: 187020117
Bug: 187020675
Test: atest OverlayConfigTest
Change-Id: I511e24b7ccfe82e6e89ceea7107457439793ef77

CtsShimPriv.apk
package: name=com.android.cts.priv.ctsshim
versionCode=30
versionName=S-7396576
platformBuildVersionName=S
compileSdkVersion=30
compileSdkVersionCodename=S
sdkVersion:24
targetSdkVersion:28

CtsShim.apk
package: name=com.android.cts.ctsshim
versionCode=30
versionName=S-7396576
platformBuildVersionName=S
compileSdkVersion=30
compileSdkVersionCodename=S
sdkVersion:24
targetSdkVersion:28

CtsShimPriv.apk
package: name=com.android.cts.priv.ctsshim
versionCode=30
versionName=S-7396576
platformBuildVersionName=S
compileSdkVersion=30
compileSdkVersionCodename=S
sdkVersion:24
targetSdkVersion:28

CtsShim.apk
package: name=com.android.cts.ctsshim
versionCode=30
versionName=S-7396576
platformBuildVersionName=S
compileSdkVersion=30
compileSdkVersionCodename=S
sdkVersion:24
targetSdkVersion:28

Built here: ab/7396576

This build IS suitable for public release.

The change is generated with prebuilt drop tool.

Bug: 188910443
Test: presubmit
Change-Id: I462a1f2ff62fd33145089c28b886a662bf8fc590
Merged-In: I462a1f2ff62fd33145089c28b886a662bf8fc590
(cherry picked from commit 969b96a3)

This patch makes LocksettingsService clear the WIFI namspace when
Keystore is reset for the primary user.

Test: Using Settings, install a WIFI certificate, tap clear credentials,
      and check that the certificate was removed from the stored
      credentials.
Bug: 189601008
Merged-In: I9364c860250653e50fa8c92c11c510c864f3c3d8
Change-Id: I9364c860250653e50fa8c92c11c510c864f3c3d8

Bug: 189129262
Change-Id: I57bcddb276f1f56d6523499bade6abc6fc7e7732
Merged-In: Id7e89a17480884b5faa63e755b98faf0b9e91365