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

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

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