[automerger skipped] Merge "DO NOT MERGE Fix NPE in executeDeletePackageLIF....

[automerger skipped] Merge "DO NOT MERGE Fix NPE in executeDeletePackageLIF. am: 01e0f481 am: 79764eb0 am: e54c2694" into rvc-qpr-dev-plus-aosp am: dd15543a -s ours

am skip reason: subject contains skip directive

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

Change-Id: I99a7e0b02cdc0bd041c41c26582320867e663ef8