[automerger skipped] Merge changes from topic "historybuildertest" into tm-dev am: 81d6f7cf77 -s ours

am skip reason: Merged-In Ib2fbd3c7703e9ed606650643db6e1977f550d90d with SHA-1 4ceb8c1f25 is already in history

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

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