[automerger skipped] Merge "DO NOT MERGE Fix NPE in executeDeletePackageLIF." into rvc-dev am: 17d62ac4 am: 8218f351 am: 3afc3f34 am: efff890f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1041c36e6a01c9307d80f0350a26fedc4db4cfa4