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 am: d29dc3d9 am: e7069bce am: f1c03846

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

Change-Id: I3a3bbd6f1b810d006cbe5e3e06fd00aa5bf09b0d