Merge "More consistently retry system calls on EINTR" into sc-dev am: 84d34f9ce5

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

Change-Id: Icf4276a6690e29ec873d804f2d919ea73c5ede2a