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