Merge changes I98571b8e,Icda61c12,If5062d86 am: cdf71668d1

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

Change-Id: I92693fe289afff9f23cd649a84e148c5603d43b3
tree: 20298a82fb8706a7f2e238c502fdaaec012e44ee
  1. staticlibs/