Merge "Attempt to de-flake testSyncState." into pie-cts-dev am: 534914efcb

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

Change-Id: Idf61df9703a2930d7b9d44cd0d7496c8c32e818f