Merge "Remove dependency on ModuleTestUtils" am: b8fca94cfe

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

Change-Id: Ib264dbe5a46612da1e1fb03c038b1d763372868f