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

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

Change-Id: Ia809b070bc1eda0fdbf4701f626fa5bbb11b42e8