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

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