Merge "Improper EINTR handling logic" am: bd0a86f9d7 am: 1b9106268f am: b7ec41f5a0 am: 854f1bc5a4

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

Change-Id: I245ec2da2ef2ac16adde23c986ef5c8a3b1436eb