Merge changes from topic "bluetooth_oob_api" am: 55fe87b2f6

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

Change-Id: I1881ca6a693ec27e78e3f781d87858f27858efbc