am 6a0f741b: am f1900b50: Merge "[LockSettings] clear secure user id when user...
am 6a0f741b: am f1900b50: Merge "[LockSettings] clear secure user id when user is removed" into mnc-dev
* commit '6a0f741b':
[LockSettings] clear secure user id when user is removed