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

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

Change-Id: If3117ad8e8d517a22c8cdf237fe1cb41d75ee414