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: 97796ab9 am: bd93b86b am: 1a7d6940

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



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