Merge "Extend timeout for receiving broadcasts" am: 15b5b58a am: a1178955 am: 0343d526

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ba4984427e72554c0aff2c173e72bdb93a9ea3c