Merge "QuickSearchBox: Move tests to SDK 9"
am: cc3026c497

Change-Id: If043e4bab028e3b4314932654a141eef0c5ef4dc