Merge "Extend timeout for receiving broadcasts" am: 08ef7ddaff am: 04707731d3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I00c12a0b52948b8c2dd345b87e847c372e287571