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

Change-Id: Ia6e606bbe766ae439c8285e2e573be98f512bca0