[automerger skipped] Merge "API Changes needed for Blueooth apex to build" am: a83857b9e2 am: 9c9e32865d am: 4ae10fe110 -s ours

am skip reason: Merged-In Ia7741309719e1f46c8c18c81b65c8862bca814e1 with SHA-1 0a7c5ec9a9 is already in history

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

Change-Id: I158b618d48c636bfd42c997487fabd2ae754efe8