am e6c7e911: Merge "Do not disable app ops on a permission revocation for modern apps." into mnc-dev

* commit 'e6c7e9116a57f673194a8eef8acbdc646311e8c0':
  Do not disable app ops on a permission revocation for modern apps.