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

Change-Id: I5399b02fb8082ea6e4488e2ab4a83ca4651a2068