Merge "Restore lockdown setting" into sc-dev am: c07d6ba8ee
am: 4176d9fe01
am: 3ae1519d2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065627 Change-Id: I91e865ed708cad226a2378c9d36d65c1de283ca3
This commit is contained in: