Merge "Use separate switch ops for runtime permissions am: e710a6fc am: a2bbc269" into nyc-mr2-dev-plus-aosp