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

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



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