Merge "Fix EINTR handling" am: 7d0bdd39fd

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

Change-Id: I02d1281a2789b6554432a0e852e713af503bc5c8