tree 3e8f3fc1cf59198ed20f008ebcf372f74e37ae56
parent 0b6462929fc2e9fe46584a0a81ea49bc93b2ac8d
parent 0343d526237f967d61b71dd41fb9876c62add317
author Treehugger Robot <treehugger-gerrit@google.com> 1614778185 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614778185 +0000

Merge "Extend timeout for receiving broadcasts" am: 15b5b58a7c am: a117895548 am: 0343d52623

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ba4984427e72554c0aff2c173e72bdb93a9ea3c