tree 3f13b493aeefc0e1df95338e5df13475f34ed92a
parent 090cc9ea640b1ef1bab7038c7b37dd4b52fd72d6
parent dec716d6d319c793db0503ce5b0a9e68874510d7
author Treehugger Robot <treehugger-gerrit@google.com> 1614717766 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614717766 +0000

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