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

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

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