[automerger skipped] Merge "Combining widget broadcasts" into tm-qpr-dev am:...

[automerger skipped] Merge "Combining widget broadcasts" into tm-qpr-dev am: e6e061e5 am: 373b3e5a -s ours

am skip reason: Merged-In I6aff0f00464ec8628d2258d0d84dcd3c82258d57 with SHA-1 1ae08fe7 is already in history

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



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