Merge "Merge "Update test expectations with Unicode 13 values" am: 1a75c09803" into stage-aosp-master