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