am 71732616: am cf00931c: Merge "Move owner info from Settings.Secure to...
am 71732616: am cf00931c: Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev
* commit '71732616':
Move owner info from Settings.Secure to LockSettings