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

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

Change-Id: I603653d8c1ef58eeaabe2c2c3c6b22450d8bab2a