Merge "Fix TEMP_FAILURE_RETRY on non-GNU C++ dialects" am: addba34668 am: aae9c4ec53

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2025446

Change-Id: Ia2a73932bdbd615400c966154e6a11cfa48ff37d