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

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

Change-Id: If75758c3134799baca694d133777454e9af0206f