Merge "[LockSettings] clear secure user id when user is removed" into mnc-dev