Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev am: 83739b6d am: a2a586a6 am: d29dc3d9 am: e7069bce am: f1c03846 am: 488660a8 am: 84233312

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

Change-Id: I38142458e6e518a6f6242f4d8294c423d85803d5