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

Change-Id: Ifbd3594524de6fc45cb199345715794f9869c9d6