Merge "Don't attempt to enable rate-limiting before T." am: 33f4e14073 am: 23037308c6

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

Change-Id: Ib18413559249c91637fbe67e0d80b391317f1fe6