Merge "Refactor the test file path" into tm-qpr-dev am: 0ad8e920

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



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