Merge changes from topic "bluetooth_oob_api" am: 2e677987 am: 8411b5d7 am: 50e294ad am: 329a11f7 am: 1f53302c

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

Change-Id: Iec59df503f8a83deecdd5bb670c27496150705c9