[automerger skipped] Merge "Remove dependency on ModuleTestUtils" am: b8fca94cfe am: 161a88303b -s ours

am skip reason: Change-Id Ic311aeaf4801c3b7c0dc5cd7a222cc304bba1335 with SHA-1 ccf4849b52 is in history

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

Change-Id: I32263fb3331823dc62491035b8e818fc9375b0f0