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

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

Change-Id: Ia87934ed89b6acc7b5b9928f8d5a974dfd7bac49