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

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

Change-Id: I6b7671fa484502228de6e750d2ecbc4b1606ed48