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 am: 054a3b98cb  -s ours
am: 8a8d41cb6e  -s ours

Change-Id: I1ffa06e99ee57a32385190a1cc359dad66f85d7c
tree: b3dc761922bf5a04a9e793f47f9aa0554f19aebc
  1. tests/