Merge "Convert frameworks/base/services/tests to Android.bp"