Merge "Merge "Increase BlockingBroadcastReceiver#DEFAULT_TIMEOUT_SECONDS to prevent flakiness." into oreo-cts-dev am: 7d10c1fe64" into oreo-mr1-cts-dev
am: 424ad31c71

Change-Id: Iafea64e2bbf5a80b50012b22f529ba13f58eaacb