Merge "Move com.android.cts.helpers.aosp to data so it's packaged...

Merge "Move com.android.cts.helpers.aosp to data so it's packaged automatically" am: 6694452c am: daf40c11 am: 00f152c8 am: 1db07e1b am: 20cc1483

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2547356



Change-Id: Icef70bd8ea922ecad1ac5cb2171e15a9cdc5abd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>