Merge "Convert frameworks/base/services/tests to Android.bp"
am: 372fa2ed21

Change-Id: Icd5b7c9add464242137f3fe28b45f1d180113b0a