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

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

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



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