Merge "Revert^2 "Block new Android.mk added to all directories except the...

Merge "Revert^2 "Block new Android.mk added to all directories except the directories for partners"" into main am: 89d23d3e

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3551042



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