Fixes for errorprone update am: 4487b3e1c0 am: 83a947432f Original change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/3297086 Change-Id: I61405c3ffcb29743f89393851e51accb6aca20dd Signed-off-by: Automerger Merge Worker <[email protected]>