Merge "Remove obsolete comment from AppOpManager"