Merge "Fix errorprone 2.15.0 errors" am: f9ae30fa am: 211af418 am:...

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

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



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