Merge "Add dependency on modules-utils-build" am: 4c85126591 am: 68933c3e39

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

Change-Id: I02b37698cf810dfb1ddd564eda140a39b1884612