[automerger skipped] Merge "Fix storing the wrong value of mLockdown in...

[automerger skipped] Merge "Fix storing the wrong value of mLockdown in setting" am: 59ce8cd4 am: 2099fa5a -s ours

am skip reason: Change-Id Ie85a347216614b7873bfdf199165d89527ada3a8 with SHA-1 9226fc37 is in history

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

Change-Id: Ieca462d23bf4c023b5b61752ee57320cede0859b