Merge changes from topic "bluetooth_oob_api" into sc-dev am: 8c09989e

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/15145442

Change-Id: I1cd4c87e11ece3b538ee0d38b01f514ad77c0fdc