Manual cherry-pick of "Update permission usage for M"

Manual cherry-pick of 72c99277ae6dd2a871a50189e1f45791108bb267
from internal/master to aosp/master

BUG:24172966
Change-Id: I7c6d97555e72a8ae8297d64c747378c9ab09354e
2 files changed