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

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

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



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