Merge "[RCS UCE] Add the extra parameter retryAfterMillis in the callback method CapabilitiesCallback#onError" am: 768384c661

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

Change-Id: Ibc62101f440a1b89d551c48b1dcc262a8e573d7e