Merge "DO NOT MERGE Fix NPE in executeDeletePackageLIF. am: 01e0f4813a am: 79764eb0cb am: e54c2694c6" into rvc-qpr-dev-plus-aosp