[automerger skipped] Merge "More consistently retry system calls on EINTR" into sc-dev am: 84d34f9c am: 2b9b70f9 -s ours am: 04856073 -s ours

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

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

Change-Id: I942d6c2453a600d518eb849ad8cc0e2164c4d16f