Merge "Do not remove profile network preference for different uids" am: 42791188b2

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

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