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

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

Change-Id: I0ce1cf3adfcc93096a1566ff6e8eeaa24055899f