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
tree: fea036c163d2203fda4f52a6509adf5652eb6a39
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS