Merge "Disable verification based on vold.decrypt. [frameworks/base]" into lmp-dev