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

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



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