Android O MR1 IOT Release 1.0.4 (4973263)
Merge "QuickSearchBox: Move tests to SDK 9" am: cc3026c497 am: 0792090fab
am: 0dcede68e9

Change-Id: Ib618786218563d919c16feefb925665861dedc13