[automerger skipped] Merge changes from topic "cts-snapshots" am: 07f97b249c am: fd242c77b1 -s ours
am skip reason: Merged-In I90d47ac9bd0570c0aed19402fa9be4e99e0f8621 with SHA-1 056b6649cd is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727822
Change-Id: I52fc9df7772c3ba87a074870cecb87f0fa637bef
This commit is contained in:
commit
d55e0b66ea