Merge "API Changes needed for Blueooth apex to build" am: a83857b9e2

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

Change-Id: Ia8e652307958b993b8a73e32f75a10ad385da6fe