Merge "Add modules-utils-os to service-connectivity" am: 588f3e84ab am: 7586ff8d8b am: 939790b120

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612195

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7bf0262dc4542e8cdf07ebf19a3367fa9b57f385