[automerger skipped] Merge changes from topic "cherrypicker-L21900000959406167:N58900001352366170" into udc-dev am: 5c541052 -s ours

am skip reason: Merged-In I359dba7eae531053653caa69eaf0cd6353255833 with SHA-1 9687c012 is already in history

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



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