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



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