Merge "Fix self-assign error in SimPhonebookContract" am: 334917b860 am: 349f6cee8b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc6093e1ac681fe4d9e30ef54f4947ff645a511d