Merge "Handle grep finds no matches." into main am: dee600b9bd

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2745856

Change-Id: Ib478de512743d6079682495b45df1bd05d46b391
Signed-off-by: Automerger Merge Worker <[email protected]>