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

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

Change-Id: I25ed7de950778a281bca5afd842126fccad3c7e0