Merge changes from topic "switch_uid_owner_map_api" am: eec62aafe4 am: 69e5f5b516

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

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