[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 -s ours am: 92697993 -s ours am: 78161a25 -s ours

am skip reason: Change-Id If57e0e0f301588f60744678f0ec942e8eb8e8a70 with SHA-1 8f3bdb82 is in history

Change-Id: I4b4af806d6cdea88c273a02441895c3ac8f1d8a1