Merge "Limit data usage request per uid" am: fc938cf026 am: 26acc088a5

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

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