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

Change-Id: I0510692cbbb996b652cd6b0c2967d44c7e7b1fbf