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

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

Change-Id: I8b1e59db3410b11b50b7abb3253179bfefced47c