Merge "Convert UiAutomator/Android.mk to Android.bp" am: 34c918d55b

Original change: https://android-review.googlesource.com/c/platform/development/+/1715514

Change-Id: I4a55a1ac94786310df8805229eed9b4eea74b119