otter2: Enable soft reboot option (2/2)

Change-Id: I8f929776bd0f77f712e6c26fc1ad8fdd128c711d
Merge branch 'cm-11.0' into kk_mkt