Merge "DO NOT MERGE Fix NPE in executeDeletePackageLIF." into rvc-dev am: 17d62ac4c7

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

Change-Id: Iad78b4bf39c8b1b9b8267df77ed94a2d69b38156