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

Change-Id: I686590199b82c538c4670a46ed431e8fe45b60fb