Merge "Merge "Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am: 846a46043c am: 491aaaae43" into oc-dr1-dev-plus-aosp am: 529c7ea9bd" into oc-mr1-dev-plus-aosp
am: 0ee5c36e7f

Change-Id: I8560667a92e1c66c59d497efce11ae48790efd7c