Merge "Fix ClipboardService device lock check for cross profile am: 0595b5a9...

Merge "Fix ClipboardService device lock check for cross profile am: 0595b5a9 am: 9e5a4ed6  -s ours am: 1c7cdde2 am: 63bb5473 am: 4c711346 am: 74b32989 am: 4afdfec2 am: bf5b9d7e am: 9f073ee9 am: c257b61e am: 21bdeaca am: 6ecad744 am: 289db3b4 am: bd0619b1" into oc-mr1-dev-plus-aosp