Merge "Merge "Adding SimPhonebookProvider" am: 7256965a45" into stage-aosp-master