am ff4ce409: Merge "Use the new per UID app op APIs for legacy permissions." into mnc-dev

* commit 'ff4ce4095d1d48153d01897bbb091b10cc83f802':
  Use the new per UID app op APIs for legacy permissions.