Merge "Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev am: b5abc8f89b -s ours"
am: 6a0cb56e57 -s ours
Change-Id: I40eece470edf1a129807bdabbd6b10e16241c3db
This commit is contained in: