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

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