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

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

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