Merge "Revert^6 "Rename build/make/target/board/Android.mk to android-info.mk...

Merge "Revert^6 "Rename build/make/target/board/Android.mk to android-info.mk and include it in main.mk directly"" into main am: 92e7f012

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



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