Merge "Remove unused Android.mk under device/google/felix am: 1890f3cb8b am: 905e71e645" into udc-qpr-dev-plus-aosp am: 5e6f781aee

Original change: https://android-review.googlesource.com/c/device/google/felix/+/2835912

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