Merge "fix null safety issue" into main am: d42b7cfd34 am: 8b9dbef324 am: 9d1832f60a am: e303d352bd am: 2eba8eb6d7

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

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