Merge "Revert "Revert "Make RollbackPackageHealthObserver observe apk-in-apex"""