Merge "Merge "Add reasons to notifyPackageUse calls" into nyc-dev am: 6894199054" into nyc-dev-plus-aosp