Merge "Migrate dependency from base to modules-utils" into stage-aosp-master am: 973054171a

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

Change-Id: Idcfc71c91692eedfa6326631efaa3033fdfceb5d