Merge changes from topic "bandwidth-limiting" am: 6b5b7b40d8 am: 4eeea56e39

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

Change-Id: I059668f6f5d5c1fa2faa3e2bca2f062f78cb4314