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

Change-Id: I5aeedb12ac229181ea5f4b2343acf81e5778494f