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

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

Change-Id: I52b4099eca7e8c8069b7fd7446784aae1a0569bc