Merge "Add RCS UP 2.4 profile string" am: bbe3fe79ee am: 2a4fdc0efd am: 6ddefa3fde

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

Change-Id: Ibbff2e7fd7ad545592556f7718a6f5599262f120