Merge "Revert "New test_module_config_entries for FrameworksCore"" into main am: 37d1bca662 am: 78a648212a

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

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