Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev am: b5abc8f89b
am: f0bc6efb5e

Change-Id: Ic20530cdbae02daf1133500e2778b8829331332b
tree: dd669a74fd87779b31b4d6f58eea0546544d5517
  1. tests/