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

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



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