Merge "Retry on unavailable." into sc-dev am: 01887da40b

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

Change-Id: I93f8c1ece3e17b832988fec623a68ef955f790f7