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

Change-Id: Id260d1861807631341732a876a0f31514ccf9bf2