Merge "Remove Keyguard owner info from RelativeLayout." into oc-dr1-dev am: f99ac67bdb
am: b618e8fe39

Change-Id: I08f58463bb236d11f45a77408be978463ae5f782