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

Change-Id: I14f77d3571e1411cc7f233a7405c9757ead26396