Merge "Fix errorprone warnings that should be errors" am: 3818a819a3 am: 76cdbd3421 am: 0951bf1b81 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2255382 Change-Id: I5aea3b0f2ad3ed0fc0e548e88e1cb68f9f7bfe75 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>