[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L15900000960513400:N59500001366504612" into udc-dev am: 339898dd -s ours

am skip reason: Merged-In Ibdc65d41d43a7fac8a861bb30587671fcbadd397 with SHA-1 487fbfe0 is already in history

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



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