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

Merge "Group broadcasts occurred within a certain duration into sessions." into tm-dev am: 0a790c64 am: 8aa21b25

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



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