Merge "LockSettings: Enforce permission check on havePattern/havePassword/systemReady" into oc-mr1-dev
am: 713a92390e

Change-Id: Iedb7368829c0b4d82c6ca8e0417340d78f180493