[DO NOT MERGE] Jump SVN to 6 for Non-VZW EMR

Bug: 204262150
Change-Id: Idb329167c988188f5c499bc580d5ba0be0a3a1f5
Merged-In: I2b2cb7e6564b9633ce2055e2de59ba9de2fdc006
(cherry picked from commit 1845dfddbc34e8b9fadabf3d900c38384ef6f642)
2 files changed