Merge "Fix test failures due to bad cast" am: e176768ae6

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Contacts/+/1580984

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5c294cda0992ad0067f72cfc688e6c509f4327dd