Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev