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

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

Change-Id: I05fbb5258850a441b8c7b45ee66d09129bd2991e