Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev...

Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev am: 83739b6d am: a2a586a6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12735135

Change-Id: Id5bfe41bdf8ce53c5da5e9d6322abf7f9df46837