Fix an embarrassing bug... again. am: 7f0a55e715 am: a263d568a9 am: 7ae5de20d9

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1552059

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I387d2400053869e9a2adebff6678af6622ec30b0