Merge "Attempt to reduce flakiness of some SimPhonebook tests" am: c5ff90ec9a am: a80b0f70e7

Original change: https://android-review.googlesource.com/c/platform/cts/+/1588153

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibcd8e4fa575767be28df1aee3a86b158b7846591