Merge changes from topic "framework-conn-stub-cp" am: 522697ed15 am: e175389feb

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

Change-Id: Id10674f8752fb856fa2149193f0c5e21f9932dcb
tree: bffe1ef4ebde270683df6c9cd80679808152d9b5
  1. staticlibs/