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

Change-Id: I21712b3913ab073d1e0265bc8eb73d9fa33c032c