Merge "[PANDORA] Remove Shadowing since we now can call hidden" am: 9c91318d...

Merge "[PANDORA] Remove Shadowing since we now can call hidden" am: 9c91318d am: 6793f53a am: bc1985a5

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



Change-Id: Ifa803ca64c3f6c32260d373c4f86f48ee744b8f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>