[automerger skipped] Merge "Remove dependency on ModuleTestUtils" into...

[automerger skipped] Merge "Remove dependency on ModuleTestUtils" into rvc-qpr-dev-plus-aosp am: 74b06048 -s ours

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

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

Change-Id: I51764490ce26b61fef892bbb33bbdc0ee3371eaf