Merge "Properly map call subject for call composer" am: dba0b177 am:...

Merge "Properly map call subject for call composer" am: dba0b177 am: 4108bac1 am: 906b8042 am: b6b2d934

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1615646

Change-Id: I6b01061777d7067fd38b19a59aa16d262d3d9b24