Merge "Revert "Revert "Suppress NewApi warnings for @SystemApi -> public APIs"""