Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1661679 Change-Id: I2470e999ceac258691257997ef1ac806a8c59252