[automerger skipped] Merge changes from topic "framework-conn-stub-cp" am: 674ce27fee am: bdcb9a7baf -s ours am: e9bdf0c514 -s ours
am skip reason: Merged-In I556747f9ba934f8b44b6ea9a518adbccc84ac2a9 with SHA-1 02b94faf80 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723151
Change-Id: Ide7cc78e5f36ecc37b0e8d1255dd6f4e95bb8ba2
This commit is contained in: