Merge "Merge "Deduplicate test expectation data in a different way" into udc-dev am: 15988e77 am: 50fbf89a" into udc-d1-dev-plus-aosp am: 7b0c181f

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



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