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