Merge "Merge "Group broadcasts occurred within a certain duration into...

Merge "Merge "Group broadcasts occurred within a certain duration into sessions." into tm-dev am: 0a790c64 am: d2cdcde5" into tm-d1-dev-plus-aosp am: 55c29cf3

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



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