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

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

Change-Id: I5f23eab62fb8c002b06dad45b766a598e100ab12