Merge changes from topic 'am-e50edd437cbb475fa514e750559a7e14'

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