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

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

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