Merge "Moves quickaffordance tests to correct pakcage." into tm-qpr-dev am:...

Merge "Moves quickaffordance tests to correct pakcage." into tm-qpr-dev am: 7eabd5f4 am: d0d0e6f2

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



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