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

Change-Id: Icf54f81733d19d91913989451a5fc07ff5f1566d