Merge "Restore lockdown setting" into sc-dev am: c07d6ba8ee am: 7922f41d88 am: 3947c8852c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065627 Change-Id: Idc918d7d7ed1bd29151b9588b98854b79693d87e
This commit is contained in: