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: I40def87cb269e58132b5da63ca05a5c0a63193cc
tree: b3dc761922bf5a04a9e793f47f9aa0554f19aebc
  1. tests/