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

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

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