am 21d1b115: Merge "Disable verification based on vold.decrypt. [frameworks/base]"

* commit '21d1b115a1d79a00991dddb883d9fb3e1863e35c':
  Disable verification based on vold.decrypt. [frameworks/base]