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

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

Change-Id: Ie149ad1856350d1cdf579c804ed149a1558ad2d7