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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I704895d43045983426ea3fff2363bfed8e9281b8