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

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

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



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