[automerger skipped] Merge "Convert FrameworksCoreTests to Android.bp" am: 5f912ecd06 am: dc90eebeac
am: 2b626c7906 -s ours
am skip reason: change_id I2f83f381f914afeff7cdbbb9d8faa67551ed0c61 with SHA1 85e2be0e90 is in history

Change-Id: Ic592193559cb1084a15ddc2efc7da04f01eefddc