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: dfc0cf84 am: f775a46d" into tm-qpr-dev-plus-aosp am: be7abccc

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



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