[automerger skipped] Merge "Note that TP1A.221005.003 is merged (aosp/2160462)" am: 6557144b32 -s ours

am skip reason: Merged-In I1706ceb129ef95f44d45754665b9dbcf9b6fdfd4 with SHA-1 dbbeb99370 is already in history

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

Change-Id: I9f98fde1347b5f34ddf17647ab659ae9e76ce96d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>