Merge "Deduplicate test expectation data in a different way" into udc-dev am: 15988e77

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



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