Android O MR1 Preview 1
Merge "fix toggling off current permissions in review"
am: 367cb02850

Change-Id: Ic8bdc6a4fa0aa3a56c89b8dd02fd0b0ccf3adc2f