Merge "Track noted app-ops for appop permissions"