Merge "Android.bp Changes" am: bc62ad4f2c am: 22e6964f0b

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

Change-Id: I0b079c3cbb57334fc009321d3660f5a1d6e6c510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>