Fixes for errorprone update am: 4487b3e1c0

Original change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/3297086

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