Merge changes from topic "bluetooth_oob_api" am: 55fe87b2f6 am: 9f8fd40407

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640633

Change-Id: Iab03a5437fd38009ef272865d065a37cd98c3c6a