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

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

Change-Id: Icf452d54dcffb8653013837486ada1d118ea0e1f