Merge "Move com.android.cts.helpers.aosp to data so it's packaged automatically" am: 6694452c

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



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