Merge "Use separate switch ops for runtime permissions am: e710a6fc66 am: a2bbc26979" into nyc-mr2-dev-plus-aosp
am: 583d798e41

Change-Id: Icd7e22dadb81e58514cef920fd9ed7cb9207433b