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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ba4984427e72554c0aff2c173e72bdb93a9ea3c
tree: 611b5107965a7a3810602075289ced3e9f1caf7e
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS