Merge "Convert tests/Android.mk to Android.bp" am: e365ae93b1

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

Change-Id: I884913cfbbef73b9e292c459b63e063daa356822