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

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

Change-Id: Ib1d729a0affeec1b4c0fa2004b490a3e0e6a86e6