Merge "Reset per-pkg app-ops for runtime permissions"