[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 am: f9b69046 am: 4e344f94 am: 7aea8439 -s ours am: 53e4fe6d -s ours

am skip reason: Change-Id I406e3c29fabff18e4f8d966477f859b0ba1f5e9a with SHA-1 31c75447 is in history

Change-Id: I006a4e6bb88a8e7589cd5054d7c3c75fc98c1345