Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev am: b5abc8f89b -s ours am: b411a9d3c1 -s ours am: 054a3b98cb -s ours am: 8a8d41cb6e -s ours
am: adcf5350c0 -s ours
Change-Id: I8ae40cf8171e5991d53d028e3446ff95b71321c4
This commit is contained in: