Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am: 846a46043c
am: 491aaaae43

Change-Id: I38a64e635f6820ca5368d154363ea3414c8e047e