Merge "Disable trust button when no screenlock is set" into nyc-dev am: 8f5c694989
am: 6e7c3db5a1
* commit '6e7c3db5a1ad0084fb086a4728ba1ddadb3d8ee9':
Change-Id: I30c35d22fbbcb4f9515a70a469be0b414e5f18f2
This commit is contained in: