Merge "Add name mapping for base64" am: 1fd4b3763e

Original change: https://android-review.googlesource.com/c/platform/development/+/1751320

Change-Id: Ic73564028a6e5b35b3fd21651057d1088cfe5b24