Android patch: Deduplicate data finding code in tests.
am: 13dcaac624

Change-Id: I765a7ba6345f62242f7d759fa9ea0dc9b34333dd