Merge "Apply module_blocklist before module_name_overrides." into main am: 8a75fcd9d0

Original change: https://android-review.googlesource.com/c/platform/development/+/2850465

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