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

Change-Id: I948bc394d3904a1c7e7245b539cd004ce8fccad1