[automerger skipped] Merge changes Ic7dedc9b,Ie022d219 am: a404089d am: 12f17753 -s ours

am skip reason: Merged-In Ic7dedc9bca9102dc1a3dc15c79500c66fadf3eb8 with SHA-1 64acf0ac is already in history

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



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