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: Ica75de60fac7bcd3216be718dd230c118ee22e15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>