[automerger skipped] Merge "Fix the description in string.xml" into rvc-dev...
[automerger skipped] Merge "Fix the description in string.xml" into rvc-dev am: cf5c30de -s ours am: 10509c41 -s ours
am skip reason: Change-Id I406e3c29fabff18e4f8d966477f859b0ba1f5e9a with SHA-1 31c75447 is in history
Change-Id: Ifa852e2dd13c530c54336229b6a9d21611903877