[automerger skipped] Merge changes...

[automerger skipped] Merge changes I72e0b382,I674beac1,Ia01fa4c0,Ibcc44694,I5602c516, ... into tm-dev am: 674fa323 -s ours am: 7d2af573 -s ours am: b36977ae -s ours

am skip reason: Merged-In I72e0b3822a934cc22c975ffbd487af957e49fdb8 with SHA-1 0cb78d93 is already in history

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



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