Merge "Fix errorprone 2.15.0 errors" am: f9ae30fa6f am: 211af41853 am: e224114968

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

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