Merge "DO NOT MERGE Fix NPE in executeDeletePackageLIF. am: 01e0f481 am: 79764eb0 am: e54c2694" into rvc-qpr-dev-plus-aosp