[automerger skipped] Merge "Add new broadcast delivery group related APIs."...

[automerger skipped] Merge "Add new broadcast delivery group related APIs." am: 995e16c9 am: 3579edde am: 0ee11c7d -s ours

am skip reason: Merged-In I36f1e3ffab8e30371a9968cb23c7b345c3301682 with SHA-1 7645452c is already in history

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



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