Merge "Fix settings show data usage with the uid of a removed package" am: 279733e3f5 am: eeb2d253fb

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

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