Merge "DO NOT MERGE: Propagate revoked permissions in permission review mode am: 4518d0be am: 20cf769d" into nyc-mr2-dev-plus-aosp