[automerger skipped] Merge "Add retries for pcm_read and pcm_write" into sc-dev am: d05fb93844 -s ours

am skip reason: Merged-In I63c0fd407b411ab7958347d10175873cf78b40ab with SHA-1 cf6cc98cc8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/generic/goldfish/+/19774546

Change-Id: I78177b97255f93667e017a9adc8271e09da50031
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>