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

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

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