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

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

Change-Id: I0b180698048fb1c643d90f2d038d1df8d66fc671