Merge "[NS01.5] Fix an embarrassing bug" am: b9eacc495e am: 77228fad66

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7a3645f0f97d6516075cdbba6bc288d04a6e1e0
tree: 5ebd6216662b9b9fee926d07f42c52e79fead473
  1. staticlibs/