Merge changes from topic "switch_uid_owner_map_api" am: eec62aafe4

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

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