This reverts commit b128d895. (cherry picked from commit 352b5f13) Bug: 73513670 Test: m javac-check RUN_ERROR_PRONE=true Merged-In: Iec0248fa045ef1c794dc1ff9deaecf5a9af50c3f Change-Id: Iec0248fa045ef1c794dc1ff9deaecf5a9af50c3f