Merge "Fix errorprone 2.15.0 errors" am: f9ae30fa am: 211af418 am: e2241149 am: dd8e8b2b

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



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