[automerger skipped] Merge "Remove dependency on ModuleTestUtils" am: b8fca94cfe am: 161a88303b -s ours am: 1ee31f0ecb -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: I19884e0a1403c6fc30403b33f4ab024d7c9444a4
This commit is contained in: