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

[automerger skipped] Merge "Migrate dependency from base to modules-utils" am: ef483e49 -s ours am: b2ffc474 -s ours

am skip reason: Merged-In I248dc29e68d3564c6723626b683b10c8a863853f with SHA-1 9150afa3 is already in history

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

Change-Id: I42f9ebadef1a6805d902f0b8b146db8096a30626