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

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

am skip reason: subject contains skip directive

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

Change-Id: Ic6822b6b1f0717976a5a706f8a8c143b6d631bfd