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: ea63b90c am: 4b997ee9 am: 599f02ea
Change-Id: I9349594dd1e6e65c441f45563b7add8453ae5aea