Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev am: b5abc8f89b am: f0bc6efb5e am: be2d3c2871 am: c0c353f6d2 -s ours am: 384309dea0 -s ours
am: ad5a21d247 -s ours
Change-Id: I1ea827dcfad6cc5d54824195c7aff42da65d43a1
This commit is contained in: