[automerger skipped] Merge "Allow vendor_init_settable for persist.sys.sf.native_mode" into pi-dev am: 4d80e2c8 -s ours am: dce5b899 -s ours Change-Id: I78e3e435f6f19a7b24fffcf55ba689355f9bf18f