Android U Beta 1 GPL
Merge "Fix errorprone warnings that should be errors" am: 5f94644361 am: e951fd9f55

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

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