[DO NOT MERGE] Jump SVN to 4 Test: adb shell getprop ro.vendor.build.svn Bug: 235336694 Change-Id: I8f0dab592e494aeaae73df507040d05c2e86c8cb