Merge "Fix test-suite for test_module_configs" into main am: 04e21b3acc

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

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