[automerger skipped] Merge "Add dependency on modules-utils-build" am:...

[automerger skipped] Merge "Add dependency on modules-utils-build" am: 4c851265 am: 68933c3e am: a41f16a2 am: 5df8a1b1 -s ours

am skip reason: Change-Id I8fca04fa22d6053aff0f58730adfa87f0bafaa3a with SHA-1 80417683 is in history

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

Change-Id: I1f8cbe547e7bfd8593fdb8cb7ec5639c54e1017e