Merge "Fix Map test with wrong dependency to hidden api" am: 36322a58

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



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