[automerger skipped] Merge "Dexopt service-connectivity." into stage-aosp-master am: 78a1e45e95 am: 7d1f3e501f am: 40f9455d6d -s ours

am skip reason: Merged-In I5a9b68172c38dd0b9f7a8f88bee738043ed3a96f with SHA-1 58c87bdcab is already in history

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

Change-Id: I64ad843a08173733d4804efd6eb0b5db28ffa11c