[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 skip reason: Change-Id If57e0e0f301588f60744678f0ec942e8eb8e8a70 with SHA-1 8f3bdb82 is in history
Change-Id: Id8693882496505b1b4f40330b76ec5971fcb8e33