Merge "Reset app freezer timeout for broadcast messages" into sc-v2-dev am: 64bab6b2

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

Change-Id: Ic5dfd663af1b0bc55bd49e06fe07f84bb6652a27