Merge "Fixes for errorprone update" into main am: 28f83ffab0

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

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