Merge "Add a carrier config for non-RCS capabilities expiration" am: 454e15dc12

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a998f7850c8be6f8813b8b4f079fb98f518e98b