[conflict] Merge changes I639960af,I7167f6fd am: 9e7b36cb am: b580c94f am: e3432ffd

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



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