[automerger skipped] Merge "Add RCS UP 2.4 profile string" am: bbe3fe79 am:...

[automerger skipped] Merge "Add RCS UP 2.4 profile string" am: bbe3fe79 am: 2a4fdc0e am: 6ddefa3f am: bdb0b2ca -s ours

am skip reason: Merged-In If5b3132469314af16c8cd9ec2a683a336fc6752f with SHA-1 fc2febd5 is already in history

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

Change-Id: Ibbfc50d21e52f307fb2ffa085f24a8eae899df81