[automerger skipped] Merge "Dexopt service-connectivity." am: 42fb8d0703 -s ours

am skip reason: Merged-In I9a009493fe0482967ab1f92516514715cfd457d6 with SHA-1 e0a64bb50c is already in history

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

Change-Id: I04b1f5155a0b497e1516fe6f951193cbb524c324