Merge "Merge "Adding SimPhonebookContract" am: 110420fcae" into stage-aosp-master am: f306fb9957 am: 407c766a8b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a79292e10c3e63cccf4e8cc1f077ddce78fb858