Merge "Fix storing the wrong value of mLockdown in setting" am: 59ce8cd45c

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

Change-Id: I820a681ee427b485d403939d023a1f6387d52ba6