Merge "Remove unnecessary Android.mk in device/google/tangorpro am: 29713d8b37 am: aaad3c04a7" into udc-qpr-dev-plus-aosp am: 14c482fbac

Original change: https://android-review.googlesource.com/c/device/google/tangorpro/+/2836335

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