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

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

Change-Id: I5f9275cf5598da9a2a4009a35fe3713b492b84eb