aml_rkp_341311000 (11068216,com.google.android.rkpd)
Merge "Fix errorprone warnings that should be errors" am: 5f94644361 am: e951fd9f55 am: 53ba2ceb44

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

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