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

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

Change-Id: I810ef0ce2c2083ffed40cc0bd789fd4e63e1b7e9