LocaleDataTables.cpp was regenerated running the following command
(should be run from frameworks/base):

$ ./tools/localedata/extract_icu_data.py $ANDROID_BUILD_TOP > libs/androidfw/LocaleDataTables.cpp

Test: m droid
Change-Id: If180ff22a74b485cc3cca34a3f9ba98c826a2210

Bug: 144415049
Test: m update-api
Change-Id: If64e5a3b46df0875844795c80cce6b76df13ad73

This reverts commit a5264903.

Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=sdk_phone_armv7-sdk&lkgb=6083299&lkbb=6085371&fkbb=6083313, bug b/146533269

Change-Id: Ie5b031d7b277cf0e09b0a9776b26bf74f5f69e70

".apex" is easy to confuse.
Rename as below:
apex: com.android.tethering.apex -> com.android.tethering
apk: com.android.tethering -> com.android.networkstack.tethering

Bug: 146471733
Test: build

Change-Id: I2c7647abb996539a3af6cfe0e0214a5e8927c0d6
Merged-In: I2c7647abb996539a3af6cfe0e0214a5e8927c0d6

With new KReclaimable stat available in /proc/meminfo include it in
getMemInfo results so that it can be accounted in dumpsys meminfo reports.

Bug: 138148041
Test: dumpsys meminfo
Change-Id: Id475fcc0a63c6fc12ea64e08cec5cd24c83848a5
Signed-off-by: Suren Baghdasaryan <surenb@google.com>

Test: manual
Bug: 135929421
Change-Id: I63043646bb96b8543849c617ce1ccd41a558f24d

Bug: 111305845
Test: atest FrameworksTelephonyTests; atest CtsTelephonyTestCases
Merged-In: Ia16f82b9cfb9e873d2c26850dfbfd451638ad30c
Change-Id: Ia16f82b9cfb9e873d2c26850dfbfd451638ad30c

This reverts commit 5c4e7b81.

Reason for revert: <b/146461873>

Bug: 146461873

Change-Id: I8bd10333f2014e52e1d3122c5b9dc895a5d6c658

Previously added "android:theme="@android:style/Theme.
DeviceDefault.DayNight" to the application tag in this manifest file to
enable dark theme for bugreport info.
BugreportWarningActivity is nested within this application tag, so
assumed all the child tags to have DayNight theme.

android:theme="@android:style/Theme.DeviceDefault.Dialog.Alert" shows
the dialog always as Dark mode.

android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"
shows the dialog always as Light mode.

This bug is not easily notice-able as "Do not show this again" checkbox
is checked by default for this dialog. Unless one wipes data partition,
this dialog doesn't come up even after flashing new builds.

Bug: 141663298
Bug: 146400225
Test: Normal (light mode) Trigger interactive/full/wifi bugreport.
      Click on bugreport finished "Share" notification.
      Light mode warning dialog should appear. (with white background)
      Uncheck the "Do not show this again" checkbox to test with dark
      mode.
Test: Go to Settings. Turn on Dark theme.
      Trigger interactive/full/wifi bugreport.
      Click on bugreport finished "Share" notification.
      Dark mode warning dialog should appear. (with dark grey background)

Merged-In: I200c592608261665e4c2416303f573522c6bc59a
Change-Id: I200c592608261665e4c2416303f573522c6bc59a
(cherry picked from commit 43bbe8a2)

This bug was introduced when fixing dark theme for bugreport dialogs.

Bug: 135446537
Bug: 146400225
Test: manually (both in light and dark theme)
Merged-In: Ib8c16d068c00632d009033c2eab7d2d6cb7e4eea
Change-Id: Ib8c16d068c00632d009033c2eab7d2d6cb7e4eea
(cherry picked from commit f90de974)

Use NetworkRegistrationInfo.getRegistrationState() to
replace serviceState.getDataNetworkType() inside getCombinedServiceState

Bug: 146473838
Test: atest frameworks/base/packages/SettingsLib/tests/robotests/\
src/com/android/settingslib/UtilsTest.java (PASS)

Change-Id: Iddf23778be5d275c76ad01bfbac8f4ed0c655331
Merged-In: Iddf23778be5d275c76ad01bfbac8f4ed0c655331

Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library.

Bug: 145132366
Test: m && diff unsupportedappusage_index.csv \
      git diff HEAD^ HEAD | grep '^[+-][^+-]' | grep -v '.import'
Change-Id: I087bb1cecbe59f1cf0c2e770c735d7a433722c6f

IPv6 addresses parceled for DNS servers, private DNS servers, PCSCF
servers were parceled without the scope. This causes issues with
link-local DNS servers.

Test: atest FrameworksNetTests
Bug: 145181158
Change-Id: I0ed24e51d4d0656f4a1f932b5e9f646b35b4b971

1. Add error codes for setPreferredOpportunisticDataSubscription and updateAvailableNetworks
2. Use Compatibility Framework to remap them.

Test: run atest.
1.atest TelephonyManagerTest#testPreferredOpportunisticDataSubscription
2.atest TelephonyManagerTest#testUpdateAvailableNetworks

Bug: 130595455
Merged-In: I6f386bfcf75236e30141fab89e2b62ee3a8cb59e
Change-Id: I6f386bfcf75236e30141fab89e2b62ee3a8cb59e

The modules 'framework', 'framework-minus-apex', 'framework-all' contain
private symbols that shouldn't be accessible to Mainline modules.
Restrict the access by making the framework modules to be accessible
only to the platform (the non updatable part).

Bug: 145796956
Test: m
Merged-In: I08cb61a67aef88ffe04ef52670144e1cbeff3cf9
Change-Id: I08cb61a67aef88ffe04ef52670144e1cbeff3cf9