Merge "Retry on signal." into sc-dev am: 5fcb9484 am: 565dee9e

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

Change-Id: I9ec57079b91436f3857480df75c08169d3a5b72e