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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I18353c628701fe19c47353bdd46c44f94fd081bd