Merge "Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am: 846a4604 am: 491aaaae" into oc-dr1-dev-plus-aosp