Merge "[RCS]Impose base64 on KsNaf" am: c9390bc55b am: 52f03fd7cb

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1662383

Change-Id: I82bd7fc4f01371cc473e2e99e7b7e7ecafef262d