Merge "Merge "[LE broadcast sink] Add the broadcast sink apis" into tm-dev am:...

Merge "Merge "[LE broadcast sink] Add the broadcast sink apis" into tm-dev am: 5f937a70 am: bf872bd3" into tm-d1-dev-plus-aosp am: 20d68a65 am: d36f40f3

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



Change-Id: I7cf3f7c2e256d32da3e78a7a150b09c3d09e7427
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>