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

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

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