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

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

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