Merge "Fix ClipboardService device lock check for cross profile" into oc-dev am: 8155446b am: 8c8e5ce9 am: a5b525bd Change-Id: I9c861e58b5dc7c1d6ba95e5e3880a0a3d7562c89