[automerger skipped] Merge "More consistently retry system calls on EINTR"...

[automerger skipped] Merge "More consistently retry system calls on EINTR" into sc-dev am: 84d34f9c -s ours am: 1c3ae12b -s ours am: 13241f64 -s ours

am skip reason: Merged-In Icbfb38be5110607c121545e5c200ce65d1eefbfe with SHA-1 c3dcb0d0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15336435

Change-Id: Ic73072883250d892ba077b4d0eb59a04fe9a0b1f