[automerger skipped] Merge "Convert tests/Android.mk to Android.bp" am: e365ae93b1 am: 1cb43b4ff7 -s ours am: 81a5ea0bd1 -s ours am: fac0fb5f31 -s ours

am skip reason: Merged-In Iec5408453710332c51929a02151112c52939a9a1 with SHA-1 949ec6dabb is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Mtp/+/1690693

Change-Id: Iaec751520f0f6020de0334cbd970a346561d2372