[automerger skipped] Merge "Add dependency on modules-utils-build" am: e4e19b65f3 am: 68933c3e39 am: 7c1f1693f7 am: 717ede64e8 -s ours

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

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

Change-Id: I1f8cbe547e7bfd8593fdb8cb7ec5639c54e1017e
tree: 78aac133dd9bb16336adc65c90ceda8cfc6f986b
  1. framework/
  2. OsuLogin/
  3. OWNERS