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