Merge "Merge "Bluetooth: ensure adapter name and address can't be read from 3p apps" into sc-qpr1-dev am: 16dcbdc0b8 am: 351ebee5ba" into sc-v2-dev-plus-aosp am: e3bb0cde20

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

Change-Id: I3ef210346109f6bd82475fd8db52bbc0216bad92