* Add der file extension to
  application/x-x509-ca-cert MIME type.

Manual testing steps
* Push .der certificate onto device
* Install CA certificate via Settings
  and select .der certificate
* Verify certificate has been
  successfully installed

Bug: 185283683
Test: manual testing
Change-Id: I0be1897a0aaf6f771c0e534533d2413ff0fc12f6

Helps for matching logs to screen contents while debugging.

Bug: 177687849
Test: manual
Change-Id: Id7e43034843f65f36c9030278728d27ec4f27168

Merge "Set a floor value for BLE Batch Scan report delay of 5000ms" am: ce2a2c80 am: da5eb08a am: 2b8dce1d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676810

Change-Id: I2aafeceb53a673e0172e5873c7354a6d59acc530

Revert "Use SpellCheckerSessionParams in CTS."

Revert submission 14191185-ky-tsm

Reason for revert: breaks build test_suites_x86_64 b/185855437
Reverted Changes:
I724aaad15:Introduce SpellCheckerSessionParams.
I510a4cfec:Use SpellCheckerSessionParams in CTS.

Change-Id: I4173bd5bee62f02a248de69df77420c39326b9f0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676810

Change-Id: Ia8dc4c371e4c1c082c22e58eff0825f156717625

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676810

Change-Id: If77fb0d86606fcc8a9b6c8a6b7f95c7990b7a9a2

Merge "Revisit the lifetime of the RebootEscrowProvider" am: d746cc81 am: fa83bba5 am: 37ae0fce

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1678645

Change-Id: I430d21fda169a79bd43dda8a7080944c196ae4e4

[automerger skipped] Merge "Addresses TODO in ResumeOnRebootService Javadoc" am: f58b4a11 am: 894b9847 am: 9d515f3a -s ours

am skip reason: skip tag Change-Id I7669bbfc3975c164e773b9517dde5e3437b2fc1a with SHA-1 47b9ccdf is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673754

Change-Id: I9f94f763f0cb5c5ed7d240d57faac16b3060503d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651247

Change-Id: I35ddf8d53ab187e6b62633646cef4956266a9695

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 837d204f -s ours am: 98e19bfc -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14238202

Change-Id: I2ceb5c2d67352dfe7c4398575599f8296886910f

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 56f2078a -s ours am: 0c37ed16 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14237777

Change-Id: I5eeece6304e34f332c9c394d79a279de27044c18

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 37ab4272 -s ours am: 4ed50618 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14238445

Change-Id: I62500abe7747b976c5a2583887368d5c704b6d71

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8ecc839b -s ours am: 3d809ce2 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14237953

Change-Id: I04fa045e8da0f83167548442d8fcb666f863de1b

[automerger skipped] Merge "Update carrier privilege check in enforceSubscriptionPlanAccess" am: 958f9efb am: 3c6d7d7d -s ours am: 740a9185 -s ours

am skip reason: skip tag Change-Id Icb4e2c619dacaea9e74cedea31865ec1eb689dce with SHA-1 172f15e5 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1663446

Change-Id: I7a39f99af7de618e0d529e7a84c39c96e2489282

Merge "Update Kotlin sample code for CountDownTimer and Parcelable" am: 598675ab am: a61b23b8 am: 3d7210ee

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673235

Change-Id: I33967535b9da48028d895d51078c545329eda681

Merge "Hide RCS PUBLISH mapping due to complicated structure" am: f7cde977 am: ce819de5 am: 98afac33

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675739

Change-Id: Icca23eab040f996f9c42f381b8ec690a02acd8ee

Merge "Clarify SipDelegateImsConfiguration getVersion Documentation" am: ca53d401 am: f03f48da am: 0f2e5f50

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675738

Change-Id: I32678bdb212c9ab1be11fe291ec3dd155e53e384

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674207

Change-Id: Ie020b0074ab0df30b4d1da8282fdc85c9518fdcf

Tag: #feature
Bug: 167340030
Test: Manual
Change-Id: I4ef99a9562f1447a2ccee42a344384a38a487c19

Since libbinder is used in many places, lightening it up (vtables in
these classes contribute to private dirty memory).

Bug: 183654927
Test: boot
Change-Id: I73328013bfb701257eb88339f7da2cb92db6809e