Merge "Merge "Fix a regression in registering for package_removed" into nyc-dev am: 7be089b7 am: b8b157b6" into nyc-mr1-dev-plus-aosp