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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3e872be0ac1d4bd4d24cdde2b9d3ed3ba02e71f3