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

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

Change-Id: Idd95fc072ac05f7bafc83e27c6e90f8b4f5a2060