Merge "Android.bp Changes" am: bc62ad4f2c am: 22e6964f0b am: e1ba5a8d35 am: 7b643c3396

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

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