tree 3a6a1b0a70723764bc6954e5a85fc179db395a40
parent e7c714140f0340c39dfca4348debb1ec9e25694e
parent 334917b860fb5e7e7220e9c814c20952502667ee
author Colin Cross <ccross@android.com> 1613585797 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613585797 +0000

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