Merge "AOSP/QuickSearchBox - update the QuickSearchBox version to target P (28) or higher."
am: d712a46ce4

Change-Id: I4e8d6861061cda77eeae4ab0b32693a5138690b2