Promote 2 warnings to errors am: 886283f105 am: fbb218ebd8

Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/3274282

Change-Id: If00bac88428700b0d6f9aef54b54eeaf18566a4b
Signed-off-by: Automerger Merge Worker <[email protected]>