[automerger skipped] Merge "Migrate dependency from base to modules-utils"...

[automerger skipped] Merge "Migrate dependency from base to modules-utils" into stage-aosp-master am: 97305417 am: fc6ca5f3 am: dfeec5f8 am: f13df339 -s ours

am skip reason: Merged-In I248dc29e68d3564c6723626b683b10c8a863853f with SHA-1 2cd901b0 is already in history

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

Change-Id: Id380a81b0aa73eb1940aa1d44ca64edc10efb4f8