[automerger skipped] Merge "Update APIs based on API review feedback" am: 5d4e9ee83d am: ccaf092fc0 am: 5dba5e229a -s ours

am skip reason: skip tag Change-Id Ie542e5ad631388d9948dd27de21bc218b5b5b8f2 with SHA-1 7f46cda1aa is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1679670

Change-Id: I9eccbeb23cbe93aff034093f99d66858874a8475