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