Merge "Fix ClipboardService device lock check for cross profile" into oc-dev am: 8155446b77 am: 8c8e5ce966
am: c94e35c549

Change-Id: I80a018bd7ad39a6a9108e1dd5295bf39bf64e48b