Merge "[RCS]Add new carrier configs for presence" am: f2fdcff51e am: 992b4ffdf8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2cf63aec6a876ca56a464f02e0ce7997ecd94b01