Merge "Merge "Using local timestamp instead of network when saving RCS...

Merge "Merge "Using local timestamp instead of network when saving RCS capability" into sc-dev am: 23a0ea2e am: c2bccde5" into sc-v2-dev-plus-aosp am: e73d56e8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/15152140

Change-Id: Ia2628e36e781d1bc455e4f0fd17384c4742bde6f