Merge "Fix errorprone warnings that should be errors" am: 5f94644361

Original change: https://android-review.googlesource.com/c/platform/external/nist-sip/+/2256803

Change-Id: I20a29fc6d18c7e65601faa3b1fb276404c9f36e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>