Merge changes from topic "cherrypicker-L79000000960801152:N61800001371340212" into udc-dev am: 6cbc8e4f7b

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

Change-Id: I0171fd508c4543c374619583d8a4d26402b73bf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 1927f96990d844469fd3ee6aad632ea206e09050
  1. client-libs/
  2. common/
  3. .gitignore
  4. OWNERS
  5. PREUPLOAD.cfg
  6. TEST_MAPPING