Merge "Android.mk is going to be deprecated under device/google folder" into main am: 4a43047559

Original change: https://android-review.googlesource.com/c/device/common/+/2836175

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