Merge "Adjust code for API council feedback" into rvc-dev am: 686aa7fe am: 8fbec9b7 am: f023a06a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/10731987

Change-Id: I39870a3c852e20630b9aa68bddbd59efac2d4c9c