Merge "Use badged icons for permissions." into nyc-dev
am: 988f3bcb21

* commit '988f3bcb21b7026cfab89d22ef912f98c9c9f8a2':
  Use badged icons for permissions.

Change-Id: I922e3df467d31be00c80128c91330b381853ce70