Merge "Remove unused Android.mk in MergeOnlyTest" into main am: 51ecc0695c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2905927

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