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

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

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



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