Merge "Catch IllegalStateException in DPM.isFinancedDevice" into main