[conflict] Merge "Fix errorprone warnings that should be errors" am:...

[conflict] Merge "Fix errorprone warnings that should be errors" am: 677d6cd7 am: f9df26ae am: d3c499da

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2256563



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