Merge "Remove duplicate logic from ModuleTestUtils" am: 20a3234d5b am: 3de06a1efb am: ee67ef39bd

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

Change-Id: I12f04f0b6e2efff756e1d43540594e1e4f3f2e59