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 am: a572c146

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



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