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

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



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