Merge "Fix EINTR handling" am: 7d0bdd39fd am: 80b29f8241

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

Change-Id: Idf9e00c0c57150cd84ce73fe8fc9e661981fbada