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

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

Change-Id: I02b37698cf810dfb1ddd564eda140a39b1884612
tree: c92e612865999394460b6155694612a7a708f5c6
  1. framework/
  2. OsuLogin/
  3. OWNERS