Merge changes from topic "b239807354" am: a2fd7dc3e8

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

Change-Id: Ie8721ff4f3bd700d3f8f855fc934c0125625f25f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 94cdd41224bb94395f84dc815df24d8b3a00a906
  1. staticlibs/