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

[automerger skipped] Merge "Fix errorprone warnings that should be errors" am: 523b6d9b am: 31f9dd89 am: 7c14c5d9 -s ours

am skip reason: Merged-In I76f6092f7dc1af45b3df12f86b2bf3ec4b00ff8f with SHA-1 bd128a9e is already in history

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



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