Merge "Fix incorrect use of TEMP_FAILURE_RETRY" am: 442727c6e8 am: 6b11060f24

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1343461

Change-Id: I92c283b54f6d61731aa1a82b5d43a5ffd56f9bd4