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: Ie7f930d649457ab8acdc38f95ff785c1a26a2814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>