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 am: 557d28ff am: c8006fec

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



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