Merge "Add get-disabled shell command to locksettings" into oc-mr1-dev
am: f9c0f06526

Change-Id: I5e683ce2a92b195804b883cce425200180130815