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

[automerger skipped] Merge "Fix errorprone warnings that should be errors" am: 654e9d6d am: 204e2c07 am: a79b2e1e -s ours

am skip reason: Merged-In I19920151701b25e34a1c82af073759d50e3bcc77 with SHA-1 f551c128 is already in history

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



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