[automerger skipped] Merge "Convert frameworks/base/services/tests to Android.bp" am: 372fa2ed21 am: fd7b5bf6d4
am: d2f716b776  -s ours

Change-Id: I85b354ee5d6a79dc9bcf6c4ebf0f4daedfba8b13