Merge "Make Android-changed markers for SecurityManager-related classes consistent."