[automerger skipped] Merge "Reset app freezer timeout for broadcast messages" into sc-v2-dev am: 64bab6b20b am: e3680890a0 -s ours
am skip reason: Merged-In Ie9d8c51b074029dc0b23cf3991f3ab21a556ca17 with SHA-1 f6c8eb3e41 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16577086
Change-Id: I57dfc6c8ba06d8bd336b47f7fcf204e5e6b2bf85
This commit is contained in: