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

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



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