Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev am: 83739b6db9 am: a2a586a61a am: d29dc3d991 am: e7069bce3c am: f1c038465d am: a50be49dd4

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

Change-Id: I677a0fe660a25239c19b3b49403049d46d807067