Merge "panic when failing to apply patch" into main am: 618eff6618

Original change: https://android-review.googlesource.com/c/platform/development/+/3107348

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