[automerger skipped] Merge "Extend strings.xml character limits" into rvc-dev...

[automerger skipped] Merge "Extend strings.xml character limits" into rvc-dev am: db87672d am: 23d8cd69 am: 4858c701 am: 2f9e3e03 -s ours am: bc45accb -s ours

am skip reason: Change-Id If57e0e0f301588f60744678f0ec942e8eb8e8a70 with SHA-1 49db92b0 is in history

Change-Id: I2e16777fc2fe3f1cabbfd29ac798295352aea4ca