[automerger skipped] Merge "Pbap use profileConnector, resolveSystemService api fix" am: 4548fa72 am: fff72939 am: 4296ee7d am: cb5ddfda -s ours

am skip reason: Merged-In I838b910c633b3ca943fec01f3ccca466ff65f892 with SHA-1 0c86889d is already in history

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

Change-Id: I7607ce90b071d0391be635e071153040f48f936e

Merge "Pbap use profileConnector, resolveSystemService api fix" am: 4548fa72 am: fff72939 am: 4296ee7d

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

Change-Id: Iee2f42ccdf2e69baf7f02ec453875477df9aca20

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

Change-Id: I6d280552480c4fd6c07ee6553666c2551068a76f

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

Change-Id: I9fdccd3ed68c5090c1322d1a6e43753a15b9a6d1

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

Change-Id: I4b15aab75f87817d6e56a9dfc941d22114e506e6

am skip reason: Merged-In Iec7db7eadd18ed6a2efc6ee39b49c1d6cb15d870 with SHA-1 0a674a8a is already in history

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

Change-Id: I623b84eb72cb4a82749874de420277ffb01531f2

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

Change-Id: I9265c69d26e9973a49b9e6331d9eb635b7959fbc

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

Change-Id: I41e37bd5c93897dfc976a71b626d1624da77ffc4

* changes:
  Double-bold the snooze option text.
  Bold StyleSpan further for auto-bold

Avoid callingUid checks for error message dumping.

BUG: 211090221
Test: Run "atest com.android.cts.packagemanager.stats.host.IncrementalAppErrorStatsTests" and check logcat.
Change-Id: I51b290bc9ecc9b983995b872dbeed251444ab569

[automerger skipped] Merge "Add ALLOW_SLIPPERY_TOUCHES permission" into sc-v2-dev-plus-aosp am: a55da3f0 -s ours

am skip reason: Merged-In I9ccdfd298f32c36b9c4da68c2e9c355c97dc7593 with SHA-1 ef804614 is already in history

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

Change-Id: Ib543e118fa0e78fe745b35b6e7dfb4f62a17cfab

Bug: 206484728
Change-Id: I32a1ca11fee7bbd05c70d4ca896088b4e4d4b784

Otherwise, a call to finish() and then start() might reallocate the
array, and cause the reference to point to the old location of the
array.

Bug: 208662370
Test: atest ForegroundModeAndActiveTest
Change-Id: I7e754c067520765c00cc67cc310926e63bd0462d

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

Change-Id: I21ac39df024565c16d75e23d2370043a13e05f1b

Merge "Revert "Revert "Reduce allocations on location delivery""" into sc-v2-dev am: d1a7093e am: fcb29d9c

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

Change-Id: Ib1bcb24500035278d9139a22607f6f95e9559637

[automerger skipped] Merge "DO NOT MERGE: Revert "DO NOT MERGE: Revert "DO NOT MERGE: Lower bound throttling interval""" into sc-v2-dev am: 332258bc am: 82f0b517 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I87f2fa61b511cb5663892e8c50b26334292e86fb

[automerger skipped] DO NOT MERGE: Revert "DO NOT MERGE: Revert "DO NOT MERGE: Lower bound throttling interval"" am: 186d929e am: fe62154c -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia290114b5363978a76fb40aa3f7866f9fb477056

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

Change-Id: I43da673c77e46be88b5af8130852acc2bcb430b0

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

Change-Id: I7c5ab0d5aaec84bbb543262d026eca8d056b3e2a

Merge "DO NOT MERGE: Revert "DO NOT MERGE: Revert "DO NOT MERGE: Lower bound throttling interval""" into sc-v2-dev am: 332258bc

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

Change-Id: I14317121bf46a88a1f228e74f7807d8e48baf0c1

DO NOT MERGE: Revert "DO NOT MERGE: Revert "DO NOT MERGE: Lower bound throttling interval"" am: 186d929e

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

Change-Id: Iee952b6738dfc181fd382a30c65ec9fdc9a50f20

* changes:
  [automerge] Annotate MediaCommunicationService for only >= S 2p: 698b4251
  Annotate MediaCommunicationService for only >= S

Merge "DO NOT MERGE: Revert "DO NOT MERGE: Revert "DO NOT MERGE: Lower bound throttling interval""" into sc-v2-dev

Merge "Add jdduke@ to services/proguard.flags OWNERS" am: 8c4a3070 am: 15ebb765 am: 8dfba713 am: ec6d4db3

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

Change-Id: Ibe8fb3272bb75c64d1c1a1493514d72da23cbc19

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

Change-Id: Ie6971c90d663f1148658b45ac56b50a905cc55ef