[automerger skipped] Merge "Extend strings.xml character limits" into rvc-dev...
[automerger skipped] Merge "Extend strings.xml character limits" into rvc-dev am: db87672d -s ours am: 06b715b5 -s ours am: 72cc67d9 -s ours
am skip reason: Change-Id If57e0e0f301588f60744678f0ec942e8eb8e8a70 with SHA-1 49db92b0 is in history
Change-Id: Iefaa55a6715dddd0d2f949d576b2357a8069cc14