Merge "Fixes for errorprone update" into main am: 28f83ffa am: 3c2d44c3

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3297590



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