Merge "Remove unused Android.mk in MergeOnlyTest" into main am: 51ecc0695c am: 53acc5b184 am: 90978a8441

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

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