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