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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I04b988119f35a0681e319aecd0769ab55cb5bf8d