[automerger skipped] Merge "Remove duplicate logic from ModuleTestUtils" am:...

[automerger skipped] Merge "Remove duplicate logic from ModuleTestUtils" am: 20a3234d am: 3de06a1e am: ee67ef39 am: a79705b1 -s ours

am skip reason: Change-Id Ia31fc9d5246203da1869cc6d0e6ffcfc8d794080 with SHA-1 c34b5738 is in history

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

Change-Id: Ic3d597694aa575d5a73657604efde49411e72665