Merge changes from topic "bluetooth_oob_api" am: 2e677987 am: 8411b5d7 am: 50e294ad am: 329a11f7 am: 877c992d am: bdcb07b5

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

Change-Id: I71344f0782b26b4a5f829183fee72db6ff6dc138