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

Change-Id: I8078fbfaf5b2de24e08afaa554d5be221804d1d1