Merge "Fix test-suite for test_module_configs" into main am: 04e21b3a am: 96221f36

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



Change-Id: If8e9eecc85738d765cd089f053ae2d905c1a77a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>