Merge "Add hidden API for whether permission review mode is on. am: 7b89a7b1 am: 90e9bbc8" into nyc-mr2-dev-plus-aosp