[automerger skipped] Skip SP2A.220305.012 am: 8493ea68f3 -s ours

am skip reason: Merged-In I74d43b3ede00f893cf30a18c58fba32a897530e1 with SHA-1 b020e552d8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/16873303

Change-Id: Ie792c40c2afda1fbb662e2195cbc80eccc30b5da