[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 am: a8f62166 -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: I6dea1c6e1a4201bf9dbda075672b15296f9eb4bf