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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib5ee042bfb3dd3fea3aaf8a82c13c37bb6975396