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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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