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: I5d0cc767a4e4c45783242f4acdc4797f40bb441c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>