Merge "Frameworks/base: move custom string in cm_strings.xml file" into cm-10.2