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

Change-Id: I6e63b41e0a0c499aeeab069da4666c4f42a18fc9