Merge "Remove duplicate logic from ModuleTestUtils" am: 20a3234d5b

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

Change-Id: If1c2534d0bdac049a755750c12f86f6263811395