[automerger skipped] Merge "DO NOT MERGE Fix NPE in executeDeletePackageLIF." into rvc-dev am: 17d62ac4c7 am: ea630d6cbb am: 520fff4691 am: 606f36288e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I948f2d0e0a294d75bb3809c8165d496e7100f191