[automerger skipped] Merge "Remove dependency on ModuleTestUtils" am:...

[automerger skipped] Merge "Remove dependency on ModuleTestUtils" am: b8fca94c am: 161a8830 -s ours am: 1ee31f0e -s ours

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

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

Change-Id: I19884e0a1403c6fc30403b33f4ab024d7c9444a4