Merge "Merge "Adding SimPhonebookContract" am: 110420fc" into stage-aosp-master am: f306fb99

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I111571106bafdec70611968c932030e200624058