Android R Beta 2
Merge "AOSP/QuickSearchBox - update the QuickSearchBox version to target P (29) or higher." am: e6416420a0

Change-Id: I2cfa7a85df6c7b659a1aa31c022d49c487b0b3fc