Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: 748e557b14 am: af364996ab

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/QuickSearchBox/+/16843784

Change-Id: I57bd9b2ef5414b724045e982df0260190c76645f