am ca58175c: Merge "Disable verification based on vold.decrypt. [frameworks/native]"

* commit 'ca58175c831376bc052bde2e25d40798f0cf7ea9':
  Disable verification based on vold.decrypt. [frameworks/native]