Merge changes from topic "bluetooth_oob_api" am: 55fe87b2f6 am: 9f8fd40407 am: 1a71a8825b am: 5fb05e5201
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640633 Change-Id: I2d79b01531a0ad8c123c8382699311d0cdc97f89
This commit is contained in: