Merge "Add permission check for owner-info related LockSettings." into jb-mr2-dev