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: I5aec93abd2940911b68511aff2d2c93055820abc