Merge "Remove hidden API usage" am: 2532505d32

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1355667

Change-Id: Icef27b900f5bf438f98db57807ae443812100e15