am fa06d03e: am 0b8fd029: am a299862d: Merge "Fix App Ops permission mapping structure."
am fa06d03e: am 0b8fd029: am a299862d: Merge "Fix App Ops permission mapping structure."

* commit 'fa06d03edf7b40f62615c58233dbdf135bac11df':
  Fix App Ops permission mapping structure.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base