[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-02516605d2c94336832595d5afea35ba" into udc-dev am: 0f9e212d -s ours am: 82abcb2a -s ours

am skip reason: Merged-In Idfbf269d253f93786a63ebdb810c6200da0d2c45 with SHA-1 482fad05 is already in history

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



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