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

Change-Id: Iaaaa496a0b092e48d7acf7901a40e9767efedba6
tree: 2152db4003ebcea0b869f824c57046a9d7958a46
  1. tests/