Merge "Extend timeout for receiving broadcasts" am: 15b5b58a7c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14924edf870ff55c334113f5d1583862be20e0f8