Merge "Revert "Suppress lint for methods using APIs promoted from system to public""