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: I3f2a81155fe4753e0edec19bdc06754d2dc612f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>