Merge "Provide a way to select force encryption from vendor partition" into lmp-mr1-dev