am c3d14005: Merge "Use a keystore_device for fallback to softkeymaster"

* commit 'c3d14005892efde05a7abdb476d7ffcd79fe5ff4':
  Use a keystore_device for fallback to softkeymaster