Merge "Fixing failures in CtsSimPhonebookProviderTestCases" into sc-dev am: 14c12e69 am: 764e4caa

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/14803410

Change-Id: I55774d1824f31ee6518f9cc212c564bfc6e021bb