Merge "Merge "Deduplicate test expectation data in a different way" into...

Merge "Merge "Deduplicate test expectation data in a different way" into udc-dev am: 15988e77 am: 97796ab9 am: b47165e9" into udc-qpr-dev-plus-aosp am: fe3e1997

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



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