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

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

Change-Id: I8481b376cb176a538f4992c2894965b8f4627b99