Merge changes I485e0bbc,I640f343d am: a95cfa14f9 am: 19fe87589b am: 61c7c591e0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8dbf97a01f1f02a59fb2e4a20e051097fa50c7ab
tree: 53782969ddffc19b9e59bc24aa2cb1b15e71b8d0
  1. staticlibs/