Merge "Save appIds permissions for each user" am: 7f85379b07 am: da5bb673c9

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

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