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

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

Change-Id: Ie7cf443891972ff642a59716f5bfb19806699172