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

Change-Id: I2d8f9790443a7f8ab00591ad5fd31723b148daea