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

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

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



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