Merge "Merge "Remove NPE in onPackageFailure" into rvc-dev am: 3ec553e20b am: 68c9d64ffb" into rvc-d1-dev-plus-aosp