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

Change-Id: Ifd34c12be06bf4eeb236cc344d90f88189cd7950