Merge "Revert "Add SuppressLint to framework-annotations-lib"" into mainline-prod