Merge "Set face unlock toggle to unchecked when disabled by admin" into...
Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9 am: ee96c179 am: e01e07fa am: d573871b
Change-Id: Iebb2b2f4cf8ebd6ff58385b5b103ee856411fd70