Merge "Merge "Android.mk is going to be deprecated under device/google folder" into main am: 4a43047559 am: ce46a74797" into udc-qpr-dev-plus-aosp am: 400545daed

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

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