Merge "DPM: Fix isActivePasswordSufficient for non-FBE devices" into pi-dev