Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3 am: 662e13b57a am: 46f8aa6d48 am: 7cbb2f7587 am: b3b2ee88cd am: c4e9bdc085  -s ours
am: 8ca874ff80  -s ours

Change-Id: I3ddea2408f094af97ff024109ab3034c53f58608