Merge "Fix issues caught by Android Lint" am: 5d3c19ca7d

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

Change-Id: Ifecfa029fd9ed0424c490f225435a5e437f87c67