Merge changes from topic "bluetooth_pb2" into udc-dev am: c32bedce am: 2d1ae3fb

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



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