Merge "Add modules-utils-os to service-connectivity" am: d55697b5e2 am: dec716d6d3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I173d225caf28c63a7cccbaf090c783775a6e01ec