Merge "Use the correct method to check if device is encrypted" into lmp-dev