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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id6699aa11c8b6656257f3cf50a182d19c1570bc4
tree: 23e703c59c297515207eb1924c6ec6410be1fa81
  1. staticlibs/