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

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