Merge "Dexopt service-connectivity." into stage-aosp-master am: 78a1e45e95 am: 7d1f3e501f

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

Change-Id: I875edcd01e6e6ae43d60f3000c9a523a0710cae5